From a2d9dd33747660fbe41c3ddc8c18b354a8a70751 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Tue, 27 Feb 2007 16:13:08 +0000 Subject: [PATCH] Fix for Solaris compile/output for VBDs in xentop. Signed-off-by: John Levon --- tools/xenstat/xentop/xentop.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c index 170b5c4caa..faff532bfa 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -916,11 +916,19 @@ void do_vbd(xenstat_domain *domain) num_vbds = xenstat_domain_num_vbds(domain); for (i=0 ; i< num_vbds; i++) { + char details[20]; + vbd = xenstat_domain_vbd(domain,i); - - print("VBD %4d [%2x:%2x] OO: %8llu RD: %8llu WR: %8llu\n", - xenstat_vbd_dev(vbd), - MAJOR(xenstat_vbd_dev(vbd)), MINOR(xenstat_vbd_dev(vbd)), + +#ifdef __sun__ + details[0] = '\0'; +#else + snprintf(details, 20, "[%2x:%2x] ", MAJOR(xenstat_vbd_dev(vbd)), + MINOR(xenstat_vbd_dev(vbd))); +#endif + + print("VBD %4d %s OO: %8llu RD: %8llu WR: %8llu\n", + xenstat_vbd_dev(vbd), details, xenstat_vbd_oo_reqs(vbd), xenstat_vbd_rd_reqs(vbd), xenstat_vbd_wr_reqs(vbd)); -- 2.30.2